Don't forget to reset reload_state when current_folder is already correct.

2008-10-08  Matthias Clasen  <mclasen@redhat.com>

        * gtk/gtkfilechooserdefault.c (update_current_folder_get_info_cb):
        Don't forget to reset reload_state when current_folder is already
        correct. Fixes https://bugzilla.redhat.com/show_bug.cgi?id=465992

svn path=/trunk/; revision=21608

diff --git a/ChangeLog b/ChangeLog
index 61dac2f26a2c087242f7ca8dbefc16ab4d6efda8..2ac960aa9e8a41a18abb8cc991e99a56ed5424c8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-10-08  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkfilechooserdefault.c (update_current_folder_get_info_cb):
+       Don't forget to reset reload_state when current_folder is already
+       correct.
+
 2008-10-08  Christian Dywan  <christian@imendio.com>
 
        Bug 555270 – Allow unsetting a MessageDialog's image

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 05e2e535f8e5f96394d17a18a80a3208f1716fa6..f5a3880778c3e6a54f340fc724ad2cdb49180931 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -6952,10 +6952,10 @@ update_current_folder_get_info_cb (GCancellable *cancellable,
        g_object_unref (impl->current_folder);
 
       impl->current_folder = g_object_ref (data->file);
-
-      impl->reload_state = RELOAD_HAS_FOLDER;
     }
 
+  impl->reload_state = RELOAD_HAS_FOLDER;
+
   /* Update the widgets that may trigger a folder change themselves.  */
 
   if (!impl->changing_folder)